merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 01:28:52 +0000 (10:28 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 01:28:52 +0000 (10:28 +0900)
commit790f8d5dcde226788be1bc0be8c3bccbd8be80a5
tree8943df3d909e13a3f6f9f4d33483cd37912c921c
parentfa4166a1e05875470357be6cc9865a75227030de
parent4fb1779bbc7d4a378c04b77a60c10309d12f0f43
merge trunk